83. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2024-03-04 14:38:47 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

83.1 Files compared

#LocationFileLast Modified
1/Users/coca/Documents/www/Porto v4.0.2/Theme Files/Magento 2.x/Porto Theme v4.0.7/app/code/Smartwave/Porto/etcacl.xml2017-07-31 17:18:46 +0000
2/Users/coca/Documents/www/Porto v4.0.2/Theme Files/Magento 2.x/Porto Theme v4.0.8/app/code/Smartwave/Porto/etcacl.xml2017-07-31 17:18:46 +0000

83.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged1112
Changed00
Inserted00
Removed00

83.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

83.4 Active regular expressions

No regular expressions were active.

83.5 Comparison detail

1 <?xml  1 <?xml 
2  version="1.0" 2  version="1.0"
3 ?> 3 ?>
4  4 
5 <config  5 <config 
6  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  6  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
7  xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd" 7  xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd"
8 > 8 >
9       9      
10  <acl> 10  <acl>
11            11           
12   <resources> 12   <resources>
13                 13                
14    <resource  14    <resource 
15     id="Magento_Backend::admin" 15     id="Magento_Backend::admin"
16    > 16    >
17                      17                     
18     <resource  18     <resource 
19      id="Magento_Backend::stores" 19      id="Magento_Backend::stores"
20     > 20     >
21                           21                          
22      <resource  22      <resource 
23       id="Magento_Backend::stores_settings" 23       id="Magento_Backend::stores_settings"
24      > 24      >
25                                25                               
26       <resource  26       <resource 
27        id="Magento_Config::config" 27        id="Magento_Config::config"
28       > 28       >
29                                     29                                    
30        <resource  30        <resource 
31         id="Smartwave_Porto::theme_settings"  31         id="Smartwave_Porto::theme_settings" 
32         title="Smartwave Porto Theme Settings Panel" 32         title="Smartwave Porto Theme Settings Panel"
33        /> 33        />
34                                     34                                    
35        <resource  35        <resource 
36         id="Smartwave_Porto::theme_design"  36         id="Smartwave_Porto::theme_design" 
37         title="Smartwave Porto Theme Design Panel" 37         title="Smartwave Porto Theme Design Panel"
38        /> 38        />
39                                     39                                    
40        <resource  40        <resource 
41         id="Smartwave_Porto::activation"  41         id="Smartwave_Porto::activation" 
42         title="Smartwave Porto Theme Activation" 42         title="Smartwave Porto Theme Activation"
43        /> 43        />
44                                 44                                
45       </resource> 45       </resource>
46                            46                           
47      </resource> 47      </resource>
48                       48                      
49     </resource> 49     </resource>
50                  50                 
51    </resource> 51    </resource>
52             52            
53   </resources> 53   </resources>
54        54       
55  </acl> 55  </acl>
56 </config> 56 </config>